Corrections. (#309718, Tim-Philipp Müller)

2005-07-07  Matthias Clasen  <mclasen@redhat.com>

	* gtk/migrating-GtkIconView.sgml: Corrections.
	(#309718, Tim-Philipp Müller)

diff --git a/docs/reference/ChangeLog b/docs/reference/ChangeLog
index 1ffdb23535b9a6b9fec350dad74f94ab37e2ac03..20210ec9c0cc48c022ff3708a8668732eea492f9 100644 (file)
--- a/docs/reference/ChangeLog
+++ b/docs/reference/ChangeLog
@@ -1,3 +1,8 @@
+2005-07-07  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/migrating-GtkIconView.sgml: Corrections.  
+       (#309718, Tim-Philipp Müller)
+       
 2005-07-06  Matthias Clasen  <mclasen@redhat.com>
 
        * gdk/tmpl/general.sgml: Point to GdkEventGrabBroken

diff --git a/docs/reference/gtk/migrating-GtkIconView.sgml b/docs/reference/gtk/migrating-GtkIconView.sgml
index 5f307126b58c1c7b3658e88ac36bc44bf3e95d4e..d571dc0b2749b4ea3bd2472bc49613c37b3e4e9a 100644 (file)
--- a/docs/reference/gtk/migrating-GtkIconView.sgml
+++ b/docs/reference/gtk/migrating-GtkIconView.sgml
@@ -48,19 +48,19 @@
       };
  
       void 
-      fill_model (GtkListStore *model)
+      fill_model (GtkListStore *store)
       {
         GtkTreeIter iter;
         GdkPixbuf *pixbuf;
 
-        gtk_list_store_append (model, &iter);
+        gtk_list_store_append (store, &iter);
         pixbuf = gdk_pixbuf_new_from_file ("file1.png", NULL);
-        gtk_list_store_set (model, &iter, PIXBUF_COLUMN, pixbuf, TEXT_COLUMN, "Icon 1", -1);
+        gtk_list_store_set (store, &iter, PIXBUF_COLUMN, pixbuf, TEXT_COLUMN, "Icon 1", -1);
         g_object_unref (pixbuf);
 
-        gtk_list_store_append (model, &iter);
+        gtk_list_store_append (store, &iter);
         pixbuf = gdk_pixbuf_new_from_file ("file2.png", NULL);
-        gnome_icon_list_append (icon_list, PIXBUF_COLUMN, pixbuf, TEXT_COLUMN, "Icon 2", -1);
+        gtk_list_store_set (store, &iter, PIXBUF_COLUMN, pixbuf, TEXT_COLUMN, "Icon 2", -1);
         g_object_unref (pixbuf);
 
         /* more icons ... */ 
@@ -70,7 +70,7 @@
       main (int argc, char *argv[])
       {
         GtkWidget *icon_view;
-        GtkTreeModel *model;
+        GtkListStore *store;
 
         gtk_init (&argc, &argv);
 
@@ -78,13 +78,13 @@
 
         /* construct the GtkIconView */
         icon_view = gtk_icon_view_new (<!-- -->);
-        model = gtk_list_store_new (3, GDK_TYPE_PIXBUF, G_TYPE_STRING, G_TYPE_POINTER);
+        store = gtk_list_store_new (3, GDK_TYPE_PIXBUF, G_TYPE_STRING, G_TYPE_POINTER);
 
         gtk_icon_view_set_pixbuf_column (GTK_ICON_VIEW (icon_view), PIXBUF_COLUMN);
         gtk_icon_view_set_text_column (GTK_ICON_VIEW (icon_view), TEXT_COLUMN);
-        gtk_icon_view_set_model GTK_ICON_VIEW (icon_view), model);
+        gtk_icon_view_set_model (GTK_ICON_VIEW (icon_view), GTK_TREE_MODEL (store));
 
-        fill_model (model);
+        fill_model (store);
 
         /* ... */
       }